auto merge of #735 : tomaka/cargo/platform-specific-deps, r=alexcrichton

author bors <bors@rust-lang.org>

Thu, 30 Oct 2014 23:29:53 +0000 (23:29 +0000)

committer bors <bors@rust-lang.org>

Thu, 30 Oct 2014 23:29:53 +0000 (23:29 +0000)
author bors <bors@rust-lang.org>
Thu, 30 Oct 2014 23:29:53 +0000 (23:29 +0000)
committer bors <bors@rust-lang.org>
Thu, 30 Oct 2014 23:29:53 +0000 (23:29 +0000)
diff --cc src/cargo/ops/cargo_rustc/fingerprint.rs
Simple merge
diff --cc tests/test_cargo_compile.rs
Simple merge
author	bors <bors@rust-lang.org>
	Thu, 30 Oct 2014 23:29:53 +0000 (23:29 +0000)
committer	bors <bors@rust-lang.org>
	Thu, 30 Oct 2014 23:29:53 +0000 (23:29 +0000)
		1	2
src/cargo/ops/cargo_rustc/fingerprint.rs	patch \|	diff1 \|	diff2 \|	blob \| history
tests/test_cargo_compile.rs	patch \|	diff1 \|	diff2 \|	blob \| history